From 8d5914fdb73640aedc63a864820bd1c3d579bf97 Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Thu, 10 Feb 2005 18:08:11 +0000 Subject: [PATCH] bitkeeper revision 1.1159.1.567 (420ba30bAq55q3Qi9iVgQ6Cl1_7CNQ) Fix asm-offsets.h dependencies. --- xen/Makefile | 2 +- xen/Rules.mk | 1 - xen/arch/x86/Makefile | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 85596cd328..4bb75adb8b 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -85,7 +85,7 @@ include/xen/banner.h: tools/figlet/figlet tools/figlet/xen.flf tools/figlet/figlet -d tools/figlet Xen $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) > $@.new @mv -f $@.new $@ -include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s $(HDRS) +include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s @(set -e; \ echo "/*"; \ echo " * DO NOT MODIFY."; \ diff --git a/xen/Rules.mk b/xen/Rules.mk index 186f4e3536..2d1cb3c3ee 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -18,7 +18,6 @@ override TARGET_ARCH := $(patsubst x86%,x86,$(TARGET_ARCH)) TARGET := $(BASEDIR)/xen HDRS := $(wildcard $(BASEDIR)/include/xen/*.h) -HDRS += $(wildcard $(BASEDIR)/include/scsi/*.h) HDRS += $(wildcard $(BASEDIR)/include/public/*.h) HDRS += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/*.h) HDRS += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/$(TARGET_SUBARCH)/*.h) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index c2a48624e0..80995e58f2 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -23,7 +23,7 @@ $(TARGET)-syms: boot/$(TARGET_SUBARCH).o $(ALL_OBJS) $(TARGET_SUBARCH)/xen.lds $(LD) $(LDFLAGS) -T $(TARGET_SUBARCH)/xen.lds -N \ boot/$(TARGET_SUBARCH).o $(ALL_OBJS) -o $@ -asm-offsets.s: $(TARGET_SUBARCH)/asm-offsets.c +asm-offsets.s: $(TARGET_SUBARCH)/asm-offsets.c $(HDRS) $(CC) $(CFLAGS) -S -o $@ $< boot/mkelf32: boot/mkelf32.c -- 2.30.2